From 658f99b8eef2805f2f4ca18c9436931e8d225b26 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 1 Sep 2010 21:30:47 -0400 Subject: [PATCH] Remove GtkRange::trough-side-details This was a style property to let theme engines 'opt-in' to more correct behaviour while maintaining compatibility with existing themes. GTK+ 3 engines are expected to handle the more correct behaviour. --- gtk/gtkrange.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 31b62fd3b1..4fefcfd6f6 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -566,21 +566,6 @@ gtk_range_class_init (GtkRangeClass *class) FALSE, GTK_PARAM_READABLE)); - /** - * GtkRange:trough-side-details: - * - * When %TRUE, the parts of the trough on the two sides of the - * slider are drawn with different details. - * - * Since: 2.10 - */ - gtk_widget_class_install_style_property (widget_class, - g_param_spec_boolean ("trough-side-details", - P_("Trough Side Details"), - P_("When TRUE, the parts of the trough on the two sides of the slider are drawn with different details"), - FALSE, - GTK_PARAM_READABLE)); - /** * GtkRange:trough-under-steppers: * @@ -1990,7 +1975,6 @@ gtk_range_expose (GtkWidget *widget, 2 * (focus_line_width + focus_padding)); gint height = (priv->range_rect.height - 2 * (focus_line_width + focus_padding)); - gboolean trough_side_details; gboolean trough_under_steppers; gint stepper_size; gint stepper_spacing; @@ -1999,7 +1983,6 @@ gtk_range_expose (GtkWidget *widget, area.y += allocation.y; gtk_widget_style_get (GTK_WIDGET (range), - "trough-side-details", &trough_side_details, "trough-under-steppers", &trough_under_steppers, "stepper-size", &stepper_size, "stepper-spacing", &stepper_spacing, @@ -2008,7 +1991,7 @@ gtk_range_expose (GtkWidget *widget, if (stepper_spacing > 0) trough_under_steppers = FALSE; - if (! trough_under_steppers) + if (!trough_under_steppers) { gint offset = 0; gint shorter = 0; @@ -2050,16 +2033,6 @@ gtk_range_expose (GtkWidget *widget, } } - if (! trough_side_details) - { - gtk_paint_box (style, window, - sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE, - GTK_SHADOW_IN, - &area, GTK_WIDGET(range), "trough", - x, y, - width, height); - } - else { gint trough_change_pos_x = width; gint trough_change_pos_y = height; -- 2.30.2